From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 5 Mar 2019 18:34:23 +0000 (+0100)
Subject: keyboard: Add bottom emoji panel row to separate aspect container
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~879^2^2~14
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b117826ada3d40d980c6fdc52565ab8dd8f325bf;p=gnome-shell.git

keyboard: Add bottom emoji panel row to separate aspect container

So we ensure the row has the right aspect ratio, and buttons neatly aligned
with the bottom row in the alphanumeric view.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/439
---

diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 124831d6a..8dc1b306f 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -881,7 +881,7 @@ var EmojiSelection = class EmojiSelection {
         this._pageIndicator.setReactive(false);
 
         let bottomRow = this._createBottomRow();
-        this.actor.add(bottomRow, { x_fill: true, y_fill: false });
+        this.actor.add(bottomRow, { expand: true, x_fill: false, y_fill: false });
 
         this._emojiPager.setCurrentPage(0);
     }
@@ -970,7 +970,16 @@ var EmojiSelection = class EmojiSelection {
         row.appendKey(key.actor);
         row.layoutButtons();
 
-        return row;
+        let actor = new AspectContainer({ layout_manager: new Clutter.BinLayout(),
+                                          x_expand: true, y_expand: true });
+        actor.add_child(row);
+        /* Regular keyboard layouts are 11.5×4 grids, optimize for that
+         * at the moment. Ideally this should be as wide as the current
+         * keymap.
+         */
+        actor.setRatio(11.5, 1);
+
+        return actor;
     }
 };
 Signals.addSignalMethods(EmojiSelection.prototype);